feat: reuse existing Devin sessions when resolving conflicts by anikdhabal · Pull Request #26711 · calcom/cal.com

anikdhabal · 2026-01-11T02:35:59Z

What does this PR do?

Updates the devin-conflict-resolver.yml workflow to reuse existing Devin sessions instead of always creating new ones when a PR has merge conflicts. This follows the same pattern used in cubic-devin-review.yml.

The workflow now:

Checks if the PR was created through Devin (session URL in PR body) - always uses that session
Checks PR comments for existing sessions (both conflict resolution and Cubic AI review sessions) and verifies they're active
Sends a message to the existing session instead of creating a new one
Only creates a new session if no active session exists

Updates since last revision

Added support for reusing Cubic AI review sessions (comments containing "Devin AI is addressing Cubic AI") in addition to conflict resolution sessions
Fixed potential TypeError by adding optional chaining for comment.body (Cubic AI review feedback)
Removed premature break statement to allow checking all comments for active sessions when earlier sessions are inactive (Cubic AI review feedback)
Simplified comment structure: both new and existing sessions now show the same full comment with all details, only the status message differs ("A Devin session has been created..." vs "The existing Devin session has been notified...")

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. N/A - workflow change only.
I confirm automated tests are in place that prove my fix is effective or that my feature works. N/A - GitHub Actions workflow, tested via production runs.

How should this be tested?

This is a GitHub Actions workflow change. To test:

Find a PR with merge conflicts that already has a Devin session from a previous conflict resolution attempt OR a Cubic AI review
Trigger the workflow manually or wait for the scheduled run
Verify the workflow sends a message to the existing session instead of creating a new one
Check that the PR comment reflects "existing Devin session has been notified" rather than "session has been created"

Human Review Checklist

Verify findExistingSession() correctly prioritizes PR body session over comment sessions
Verify active status check (['working', 'blocked', 'resumed']) matches expected Devin API statuses
Verify both session patterns are correct:
- 'Devin AI is resolving merge conflicts' for conflict resolution
- 'Devin AI is addressing Cubic AI' for Cubic AI reviews
Verify Devin API endpoints are correct (/v1/sessions/{id} for status, /v1/sessions/{id}/message for messaging)
~~Optional chaining for comment.body to prevent TypeError~~ (fixed)
~~Loop continues checking all comments when a session is inactive~~ (fixed)

- Check if PR was created through Devin and use that session - Check PR comments for existing active Devin sessions - Send message to existing session instead of creating new one - Only create new session if no active session exists - Update comment message to reflect whether session is new or reused Co-Authored-By: anik@cal.com <adhabal2002@gmail.com>

devin-ai-integration · 2026-01-11T02:36:01Z

🤖 Devin AI Engineer

I'll be helping with this pull request! Here's what you should know:

✅ I will automatically:

Address comments on this PR that start with 'DevinAI' or '@devin'.
Look at CI failures and help fix them

Note: I can only respond to comments from users who have write access to this repository.

⚙️ Control Options:

Disable automatic comment and CI monitoring

…ions - Added 'Devin AI is addressing Cubic AI' to session patterns - Now checks for both conflict resolution and Cubic AI review sessions Co-Authored-By: anik@cal.com <adhabal2002@gmail.com>

…euse

cubic-dev-ai

2 issues found across 1 file

Prompt for AI agents (all issues)


Check if these issues are valid — if so, understand the root cause of each and fix them.


<file name=".github/workflows/devin-conflict-resolver.yml">

<violation number="1" location=".github/workflows/devin-conflict-resolver.yml:263">
P2: Potential TypeError if `comment.body` is null. Use optional chaining to safely access the body, consistent with the `prBody?.match()` pattern used earlier.</violation>

<violation number="2" location=".github/workflows/devin-conflict-resolver.yml:280">
P2: The `break` statement is placed outside the active status check, causing the loop to exit even when a found session is inactive. This prevents finding other potentially active sessions from earlier comments. Either remove the `break` to check all sessions, or move it inside the success case.</violation>
</file>

_{Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.}

.github/workflows/devin-conflict-resolver.yml

github-actions · 2026-01-11T04:38:04Z

Devin AI is addressing Cubic AI's review feedback

New feedback has been sent to the existing Devin session.

View Devin Session

- Add optional chaining for comment.body to prevent TypeError - Remove break statement to allow checking all comments for active sessions Co-Authored-By: anik@cal.com <adhabal2002@gmail.com>

…tps://git-manager.devin.ai/proxy/github.com/calcom/cal.com into devin/1768098824-conflict-resolver-session-reuse

anikdhabal · 2026-01-11T04:48:03Z

.github/workflows/devin-conflict-resolver.yml

+                    : `### Devin AI is resolving merge conflicts
+
+            This PR has new merge conflicts with the \`${pr.base_ref}\` branch. The existing Devin session has been notified to resolve them.
+
+            [View Devin Session](${sessionUrl})`;
+
+                  await github.rest.issues.createComment({
+                    owner,
+                    repo,
+                    issue_number: pr.number,
+                    body: commentBody


DevinAI, can you explain why you made this change from the previous one? Is it needed?

Yes, this change is needed to differentiate between two scenarios:

New session created: The original comment says "A Devin session has been created to automatically resolve them" and lists all the steps Devin will take

Existing session reused: The new shorter comment says "The existing Devin session has been notified to resolve them"

This distinction is important because:

When reusing an existing session, we're just sending a message to an already-running session, not creating a new one

The shorter message avoids redundantly listing all the steps again (the user already saw those when the session was first created)

It makes it clear to PR reviewers that no new session was spawned - we're just continuing work in the existing one

This follows the same pattern used in cubic-devin-review.yml (lines 224-226) which also has different comment messages for new vs. existing sessions.

DevinAI No, we don’t want a refactor here. Keep it as it is, like before. The only change I want is: when a new session is created, show “A Devin session has been created to automatically resolve them,” and if not, show “The existing Devin session has been notified to resolve them.”

Good point! I've updated the code to keep the same full comment structure for both cases. Now both new and existing session comments will show the complete list of what Devin will do, with only the status message differing:

New session: "A Devin session has been created to automatically resolve them."

Existing session: "The existing Devin session has been notified to resolve them."

Pushed in commit 16b1fa8.

.github/workflows/devin-conflict-resolver.yml

- Both new and existing session comments now show the full list of what Devin will do - Only the status message differs: 'created' vs 'notified' Co-Authored-By: anik@cal.com <adhabal2002@gmail.com>

…26711) * feat: reuse existing Devin sessions when resolving conflicts - Check if PR was created through Devin and use that session - Check PR comments for existing active Devin sessions - Send message to existing session instead of creating new one - Only create new session if no active session exists - Update comment message to reflect whether session is new or reused Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> * feat: also check for Cubic AI review sessions when reusing Devin sessions - Added 'Devin AI is addressing Cubic AI' to session patterns - Now checks for both conflict resolution and Cubic AI review sessions Co-Authored-By: anik@cal.com <adhabal2002@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

pull-request-size bot added the size/L label Jan 11, 2026

devin-ai-integration bot and others added 2 commits January 11, 2026 02:48

feat: also check for Cubic AI review sessions when reusing Devin sess…

7186b7f

…ions - Added 'Devin AI is addressing Cubic AI' to session patterns - Now checks for both conflict resolution and Cubic AI review sessions Co-Authored-By: anik@cal.com <adhabal2002@gmail.com>

Merge branch 'main' into devin/1768098824-conflict-resolver-session-r…

00d6cc4

…euse

anikdhabal marked this pull request as ready for review January 11, 2026 04:33

anikdhabal requested review from a team as code owners January 11, 2026 04:33

graphite-app bot added the core area: core, team members only label Jan 11, 2026

anikdhabal enabled auto-merge (squash) January 11, 2026 04:33

cubic-dev-ai bot reviewed Jan 11, 2026

View reviewed changes

.github/workflows/devin-conflict-resolver.yml Outdated Show resolved Hide resolved

.github/workflows/devin-conflict-resolver.yml Outdated Show resolved Hide resolved

devin-ai-integration bot and others added 2 commits January 11, 2026 04:38

fix: address Cubic AI review feedback

78e95e0

- Add optional chaining for comment.body to prevent TypeError - Remove break statement to allow checking all comments for active sessions Co-Authored-By: anik@cal.com <adhabal2002@gmail.com>

Merge branch 'devin/1768098824-conflict-resolver-session-reuse' of ht…

f48d0ee

…tps://git-manager.devin.ai/proxy/github.com/calcom/cal.com into devin/1768098824-conflict-resolver-session-reuse

anikdhabal commented Jan 11, 2026

View reviewed changes

.github/workflows/devin-conflict-resolver.yml Show resolved Hide resolved

fix: use same comment structure for new and existing sessions

16b1fa8

- Both new and existing session comments now show the full list of what Devin will do - Only the status message differs: 'created' vs 'notified' Co-Authored-By: anik@cal.com <adhabal2002@gmail.com>

anikdhabal added this to the v6.1 milestone Jan 11, 2026

anikdhabal requested a review from keithwillcode January 11, 2026 11:36

keithwillcode added the ready-for-e2e label Jan 11, 2026

keithwillcode approved these changes Jan 11, 2026

View reviewed changes

anikdhabal merged commit 1e98652 into main Jan 11, 2026
73 of 75 checks passed

anikdhabal deleted the devin/1768098824-conflict-resolver-session-reuse branch January 11, 2026 14:08

vercel bot temporarily deployed to Preview – dev January 13, 2026 08:27 Inactive

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: reuse existing Devin sessions when resolving conflicts#26711

feat: reuse existing Devin sessions when resolving conflicts#26711
anikdhabal merged 6 commits intomainfrom
devin/1768098824-conflict-resolver-session-reuse

anikdhabal commented Jan 11, 2026 •

edited by devin-ai-integration bot

Loading

Uh oh!

devin-ai-integration bot commented Jan 11, 2026

Uh oh!

cubic-dev-ai bot left a comment

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jan 11, 2026

Uh oh!

anikdhabal Jan 11, 2026

Uh oh!

devin-ai-integration bot Jan 11, 2026

Uh oh!

anikdhabal Jan 11, 2026 •

edited

Loading

Uh oh!

devin-ai-integration bot Jan 11, 2026

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

anikdhabal commented Jan 11, 2026 • edited by devin-ai-integration bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Updates since last revision

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

Human Review Checklist

Uh oh!

devin-ai-integration bot commented Jan 11, 2026

🤖 Devin AI Engineer

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jan 11, 2026

Devin AI is addressing Cubic AI's review feedback

Uh oh!

anikdhabal Jan 11, 2026

Choose a reason for hiding this comment

Uh oh!

devin-ai-integration bot Jan 11, 2026

Choose a reason for hiding this comment

Uh oh!

anikdhabal Jan 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

devin-ai-integration bot Jan 11, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

anikdhabal commented Jan 11, 2026 •

edited by devin-ai-integration bot

Loading

anikdhabal Jan 11, 2026 •

edited

Loading